##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include <apt-pkg/acquire-method.h>
+#include <config.h>
+
#include <apt-pkg/cdrom.h>
#include <apt-pkg/cdromutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
#include <apt-pkg/hashes.h>
+#include "aptmethod.h"
+
+#include <string>
+#include <vector>
#include <sys/stat.h>
-#include <unistd.h>
-#include <dlfcn.h>
#include <iostream>
#include <apti18n.h>
using namespace std;
-class CDROMMethod : public pkgAcqMethod
+class CDROMMethod : public aptMethod
{
bool DatabaseLoaded;
+ bool Debug;
+
::Configuration Database;
string CurrentID;
string CDROM;
bool MountedByApt;
+ pkgUdevCdromDevices UdevCdroms;
- bool IsCorrectCD(URI want, string MountPath);
- virtual bool Fetch(FetchItem *Itm);
+ bool IsCorrectCD(URI want, string MountPath, string& NewID);
+ bool AutoDetectAndMount(const URI, string &NewID);
+ virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
string GetID(string Name);
- virtual void Exit();
+ virtual void Exit() APT_OVERRIDE;
public:
// CDROMMethod::CDROMethod - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
+CDROMMethod::CDROMMethod() : aptMethod("cdrom", "1.0",SingleInstance | LocalOnly |
SendConfig | NeedsCleanup |
- Removable),
- DatabaseLoaded(false),
+ Removable),
+ DatabaseLoaded(false),
+ Debug(false),
MountedByApt(false)
{
-
-
-};
+ UdevCdroms.Dlopen();
+}
/*}}}*/
// CDROMMethod::Exit - Unmount the disc if necessary /*{{{*/
// ---------------------------------------------------------------------
return string();
}
/*}}}*/
+// CDROMMethod::AutoDetectAndMount /*{{{*/
+// ---------------------------------------------------------------------
+/* Modifies class varaiable CDROM to the mountpoint */
+bool CDROMMethod::AutoDetectAndMount(const URI Get, string &NewID)
+{
+ vector<struct CdromDevice> v = UdevCdroms.Scan();
+
+ // first check if its mounted somewhere already
+ for (unsigned int i=0; i < v.size(); i++)
+ {
+ if (v[i].Mounted)
+ {
+ if (Debug)
+ clog << "Checking mounted cdrom device " << v[i].DeviceName << endl;
+ if (IsCorrectCD(Get, v[i].MountPath, NewID))
+ {
+ CDROM = v[i].MountPath;
+ return true;
+ }
+ }
+ }
+
+ // we are not supposed to mount, exit
+ if (_config->FindB("APT::CDROM::NoMount",false) == true)
+ return false;
+
+ // check if we have the mount point
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint.c_str(), 0750);
+
+ // now try mounting
+ for (unsigned int i=0; i < v.size(); i++)
+ {
+ if (!v[i].Mounted)
+ {
+ if(MountCdrom(AptMountPoint, v[i].DeviceName))
+ {
+ if (IsCorrectCD(Get, AptMountPoint, NewID))
+ {
+ MountedByApt = true;
+ CDROM = AptMountPoint;
+ return true;
+ } else {
+ UnmountCdrom(AptMountPoint);
+ }
+ }
+ }
+ }
+ return false;
+}
+ /*}}}*/
// CDROMMethod::IsCorrectCD /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool CDROMMethod::IsCorrectCD(URI want, string MountPath)
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath, string& NewID)
{
- bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
- string NewID;
-
for (unsigned int Version = 2; Version != 0; Version--)
{
if (IdentCdrom(MountPath,NewID,Version) == false)
return false;
- if (Debug == true)
+ if (Debug)
clog << "ID " << Version << " " << NewID << endl;
// A hit
/* */
bool CDROMMethod::Fetch(FetchItem *Itm)
{
+ FetchResult Res;
+
URI Get = Itm->Uri;
string File = Get.Path;
- FetchResult Res;
+ Debug = DebugEnabled();
- bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
if (Debug)
clog << "CDROMMethod::Fetch " << Itm->Uri << endl;
return true;
}
- CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+ bool const AutoDetect = ConfigFindB("AutoDetect", true);
+ CDROM = _config->FindDir("Acquire::cdrom::mount");
if (Debug)
clog << "Looking for CDROM at " << CDROM << endl;
if (CDROM[0] == '.')
CDROM= SafeGetCWD() + '/' + CDROM;
- string NewID;
- pkgUdevCdromDevices udev;
+ string NewID;
while (CurrentID.empty() == true)
{
- // hrm, ugly the loop here
- if (CDROM == "apt-udev-auto/")
- {
- if(udev.Dlopen())
- {
- vector<struct CdromDevice> v = udev.Scan();
- for (unsigned int i=0; i < v.size(); i++)
- {
- if (Debug)
- clog << "Have cdrom device " << v[i].DeviceName << endl;
- if (!v[i].Mounted)
- {
- if (!FileExists("/media/apt"))
- mkdir("/media/apt", 0755);
- if(MountCdrom("/media/apt", v[i].DeviceName))
- {
- if (IsCorrectCD(Get, "/media/apt"))
- {
- MountedByApt = true;
- CDROM = "/media/apt";
- break;
- } else {
- UnmountCdrom("/media/apt");
- }
- }
- } else {
- if (IsCorrectCD(Get, v[i].MountPath))
- {
- CDROM = v[i].MountPath;
- break;
- }
- }
- }
- } else {
- _error->WarningE("udev.Dlopen() failed","foo");
- }
- }
+ if (AutoDetect)
+ AutoDetectAndMount(Get, NewID);
- bool Hit = false;
if(!IsMounted(CDROM))
MountedByApt = MountCdrom(CDROM);
- if (IsCorrectCD(Get, CDROM))
+ if (IsCorrectCD(Get, CDROM, NewID))
break;
// I suppose this should prompt somehow?
struct stat Buf;
if (stat(Res.Filename.c_str(),&Buf) != 0)
return _error->Error(_("File not found"));
-
+
+ URIStart(Res);
if (NewID.empty() == false)
CurrentID = NewID;
Res.LastModified = Buf.st_mtime;
Res.Size = Buf.st_size;
- Hashes Hash;
+ Hashes Hash(Itm->ExpectedHashes);
FileFd Fd(Res.Filename, FileFd::ReadOnly);
- Hash.AddFD(Fd.Fd(), Fd.Size());
+ Hash.AddFD(Fd);
Res.TakeHashes(Hash);
URIDone(Res);
int main()
{
- setlocale(LC_ALL, "");
-
- CDROMMethod Mth;
- return Mth.Run();
+ _config->CndSet("Binary::cdrom::Debug::NoDropPrivs", true);
+ return CDROMMethod().Run();
}
projects / apt.git / blobdiff